diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 995b2f27e..e41540f16 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -131,11 +131,11 @@ endif()
 if ( ENABLE_STATIC_BOOST_LIBS )
   set(Boost_USE_STATIC_LIBS ON)
   set(BOOST_TEST_DYN_LINK "")
-  ecbuild_info( "Using STATIC boost libraries : ${BOOST_TEST_DYN_LINK}" )
+  ecbuild_info( "Using STATIC boost libraries" )
 else()
   set(Boost_USE_STATIC_LIBS OFF)
   set(BOOST_TEST_DYN_LINK "BOOST_TEST_DYN_LINK")
-  ecbuild_info( "Using SHARED boost libraries : ${BOOST_TEST_DYN_LINK}" )
+  ecbuild_info( "Using SHARED boost libraries : (i.e. defining ${BOOST_TEST_DYN_LINK})" )
 endif()
 
 set(Boost_USE_MULTITHREADED    ON)
diff --git a/libs/pyext/.gitignore b/libs/pyext/.gitignore
index 2ed7e9886..05034449f 100644
--- a/libs/pyext/.gitignore
+++ b/libs/pyext/.gitignore
@@ -1,3 +1,4 @@
 /build
 /setup.py
 /timestamp
+/ecflow/__init__.py
diff --git a/libs/pyext/CMakeLists.txt b/libs/pyext/CMakeLists.txt
index 7ecf930c1..32977974e 100644
--- a/libs/pyext/CMakeLists.txt
+++ b/libs/pyext/CMakeLists.txt
@@ -83,40 +83,40 @@ set(srcs
 # tests
 # =====================================================================
 set(u_tests
-  py_u_test_add
-  py_u_test_collection
-  py_u_test_cron
-  py_u_test_defs_constructor
-  py_u_test_get_attr
-  py_u_test_manual
-  py_u_test_node
-  py_u_test_late
-  py_u_test_replace_node
-  py_u_test_tutorial
-  py_u_TestAddDelete
-  py_u_TestAddDeleteFunc
-  py_u_TestAddNodeFunc
-  py_u_TestAutoAddExtern
-  py_u_TestAviso
-  py_u_TestCopy
-  py_u_TestDefs
-  py_u_TestDefsCheck
-  py_u_TestDerivable
-  py_u_TestEcf
-  py_u_TestError
-  py_u_TestFind
-  py_u_TestFlag
-  py_u_TestGetAllTasks
-  py_u_TestJobGeneration
-  py_u_TestMirror
-  py_u_TestParent
-  py_u_TestRemove
-  py_u_TestRepeatArithmetic
-  py_u_TestSimulator
-  py_u_TestTraversal
-  py_u_TestUserManual
-  py_u_TestWith
-  py_u_sort
+  u_test_add
+  u_test_collection
+  u_test_cron
+  u_test_defs_constructor
+  u_test_get_attr
+  u_test_manual
+  u_test_node
+  u_test_late
+  u_test_replace_node
+  u_test_tutorial
+  u_TestAddDelete
+  u_TestAddDeleteFunc
+  u_TestAddNodeFunc
+  u_TestAutoAddExtern
+  u_TestAviso
+  u_TestCopy
+  u_TestDefs
+  u_TestDefsCheck
+  u_TestDerivable
+  u_TestEcf
+  u_TestError
+  u_TestFind
+  u_TestFlag
+  u_TestGetAllTasks
+  u_TestJobGeneration
+  u_TestMirror
+  u_TestParent
+  u_TestRemove
+  u_TestRepeatArithmetic
+  u_TestSimulator
+  u_TestTraversal
+  u_TestUserManual
+  u_TestWith
+  u_sort
 )
 
 set(s_tests
diff --git a/libs/pyext/ecflow/__init__.py b/libs/pyext/ecflow/__init__.py
deleted file mode 100644
index 3e8d0b632..000000000
--- a/libs/pyext/ecflow/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from .ecflow import *
-
-# Name        :
-# Author      : Avi
-# Revision    : $Revision: #10 $ 
-#
-# Copyright 2009- ECMWF.
-# This software is licensed under the terms of the Apache Licence version 2.0 
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
-# In applying this licence, ECMWF does not waive the privileges and immunities 
-# granted to it by virtue of its status as an intergovernmental organisation 
-# nor does it submit to any jurisdiction.  
-
-"""
-The ecFlow python module
-"""
-
-__version__ = '5.13.6'
-
-# http://stackoverflow.com/questions/13040646/how-do-i-create-documentation-with-pydoc
diff --git a/libs/pyext/python3/CMakeLists.txt b/libs/pyext/python3/CMakeLists.txt
index 13e3bf4d2..6dba44ef6 100644
--- a/libs/pyext/python3/CMakeLists.txt
+++ b/libs/pyext/python3/CMakeLists.txt
@@ -68,7 +68,7 @@ foreach( test ${u_tests} )
       python nightly
     TYPE PYTHON
     ARGS
-      ${CMAKE_CURRENT_SOURCE_DIR}/../test/${test}.py
+      ${CMAKE_CURRENT_SOURCE_DIR}/../test/py_${test}.py
     ENVIRONMENT
       "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
     TEST_DEPENDS