Corrections to test names
further refactoring