Improved code coverage all round