changed tagret test-java to test and made it default
Merge remote-tracking branch 'upstream/master'