Further test coverage