Rework of the test cases in the *.test files