Issue ITTE-692

I finished all the tests on the tasks.