Full test coverage

As part of the effort of getting the codebase 100% tested, many small changes have been made which are all very minor.

There is one more backwards-breaking change planned which will be released in 1.3.0.