Integration testing frame for CLI - rev2

This is rev2 of #44