Fix a test, add one, and correct a typo