Added a method getSingular. Added a number of test cases, but more need to be added.