Various grammar fixes and add some test coverage