updates to add tests for enhanced code-coverage