Fix the Makefile to run jython tests correctly again. Minor refactorage as well.