Fix some test cases to prevent enormous fail messages