Fix a few test issues