updated some tests
Remove java-specific code from Makefile
Merge branch 'master' into ritesh