Pull request.unit test fixes

Some minor unit test fixes