More Unit Test Fixes.