Clean up tests
Tests-on-jvm should be a subproject