Add more tests for custom schema
Handle regular english plurals correctly