More Unit Test Imrovements