Major Java improvements: Test-phase
Revert errors on previous to compiler/driver.c from commit
Merge branch 'whatnot'

* whatnot:
  Revert errors on previous to compiler/driver.c from commit
  Major Java improvements: Test-phase