Merge "Move test so that it doesn't run with --jvm."