Refactoring to make test for plurals seperate to similarity. Not finished but core is there and passing tests