SCRUM-1550 - Fix broken test