[#1513] Yekkanti - Refactored and fixed some failing tests in travis