Various Unit Test Corrections