Cleaning up test coverage