Final changes on the test suite which led to more changes on the main modules