Refactoring; moving tests to correct directory in maven structure