Fix a few tests