More changes for ai2test-splash2