Rename do notation grammar file
Implement tests for rules close #3