Moved utility functions to common
Added preliminary consuming tests
Fixed extra paren consuming
Slightly more tests
Merge branch 'consume-control'