Fixed ctest python tests to work again (after major architectural change when cherryd dependency was eliminated).
Merge branch 'ctest'