Fix Broken Test Fixtures