Unit test refactoring

test methods renamed