Task 13 with test added