parser tests added, small grammar changes