Move cli asserts to test class

This commit moves the cli test specific asserts into the test class.
Previously, they were added to the client class as part of the
refactor into library. When the test class was added again these
methods weren't added back.