Fix a few minor issues in tests