made some changes with regards to plural v singular, added tests