Deleted Java test.
Final version.
Merge branch 'develop'
Final merge to master.