More test coverage; removed unused grammar