Updated struct for results, consolidated test_search test function since it was defined twice