Fixed tests after merge
Merge branch 'task7' into task9