Fix a couple test errors.