Improve test coverage, run tests on Jython