CommandIQ: ocd

Formatting changes, and updating a few of the tests