Final code coverage changes for now