Refactored classes to src/main/java instead of src/main/test
Removed broken test