Added tests for task 58