Merge pull request #1060 from JosephGoulden/function_test_utils_logs