Test coverage improvement

While checking the code and playing with the `simplecov`, I've found few places without test coverage.