Improved pluralisation and added tests