#1494 - Subhas/Akash - fixed some tests