Resolve test failure
Additional unit test coverage for new functionality