SCRUM-1896 - test fixes from merge