Refactored
Refactored
Moved java test files to local project
Removed typo in package name