grammar bugfix + a few tests