Fix small issue with find_return_with_arguments method, uncomment now working tests