Add jvmArgs to test + some cleanup