Minor refactoring.
Improve cofig for the multi-jvm tests.