Cleanup - Mended some broken test.