Added commenting tests and applied appropriate fixes so most of them pass
Merge branch 'fixes'