SCRUM-1547 - Finished test code