SCRUM-1550 - Completed unit tests