[#1513] Yekkanti - Some more fixes to the tests