Moved the test objects to src/groovy