Test refactoring, now maven test runs the correctly