(finally) fix some fragile test cases