Fixups for ai2test-splash2