It seems that (at last!) all the outstanding testbot errors are unrelated to this patch. In the last version I had to compromise a little bit to avoid making the test too brittle, but it should still test for the behaviour required by the game and at the same justify the change.