Updates for more code coverage