Updated test files and grammar