Fix a couple failing tests