Adding some modifications and tests to up code coverage.