Fix a couple of tests