More Minor Test Fixes