Merge pull request #2 from Higgcz/java

Merge Java
Test refactored