Add task_25
Add tests for task_25