Task 24 and tests