CVS: improve test coverage

Created by: LawnGnome

The existing codebase is intermittently tested: this needs to be improved across the board to make it more maintainable in the longer term.