Bring test coverage to 100%