Forget it, we're going back to what we had before, this should now build
properly, only needed to add junit.jar to lib folder