1582 - Suganthi - Fixed failing cucumber tests