unit test fixes.
Merge pull request #800 from pulp/jortel-unit-fixes

Misc unit test fixes