Merge "Add some more tests to those breaking since move to OpenJDK"