Adding tests
Better pluralizing