Clean up client spec
Test additional class methods
Merge branch 'chore/improve_test_coverage-21' into development

* chore/improve_test_coverage-21:
  Test additional class methods
  Clean up client spec