Test coverage

Improves the test coverage to 100%.