Added tests and test cases for a few files
Removing nasty leading underscores
Add support for the do-while statement to the curly rule (closes #167)