Upgrade test coverage: paying my technical debt :)