Add unit tests
Add miscellaneous parser rules