(We had to fix our tests to do this, though it wasn't hard once we knew what to do)