Updated for code coverage