fixes and updated test suite code coverage