Test Fixes for live production

Test Fixes for live production