(finally) Fix some fragile test cases