Test Fixes for live production