More tests and grammar fixes