maven tests name fix, refactoring