Fix configuration
Fix multi-jvm tests