Test Support for Live prod, fix for travis Build

Test Support for Live, and Fix for travis Build