Improvement to the test framework and debugging
rename of the tests