TESTS more refactoring