Fix a couple of test issues