Correct a typo, add some tests for consistency