Fixing CLI on Mac
Integrating assert-plus