Trying to improve code coverage