Refactoring into src/test/scala