Finish basic set of grammar rules and add some test files