grammer fixes and more tests