First attempt to run tests on the Java target.
Merge branch 'master' into java
Running on Java. Makefile fixes. Added TODO list.
Minor.