fix not working JUnitCrossVersionIntegrationSpec; some refactorings to the Junit related integration tests