Improve unit testing coverage
Turn down verbosity
Fixup use of assert_not_called
Fixup use of assert_called()
[james-page] Improved unit testing coverage