Extended unit tests; Fixed grammar.