Final touches for code coverage

I had neglected testing some code until now. Tests are 100% and so is the code coverage.

Rock on!