Adding extra performance tests to compare more directly with the Java code