Fix a couple of failing tests