Expanded unit tests for slight code coverage improvement