Unborked all tests, again