Fix a couple tests