fixed tests for final grammar
Merge branch 'master' of github.com:ty707/SCALR