Increase test coverage

Some more specs and code removal to increase test coverage.
I agree. I’ll remove the `nil` check, remove the test – and make the method private.