Test Failures Fixes