Improve test coverage (see Makefile for `coverage' target)
Coverage of automated tests now at 96% \o/