Added tests for scheme-grammer-enhanced