Increase test coverage to 100%