Issue ITTE - 692

Tests on tasks 2,3,4.