more tests and correct pluralizations