Bring context_line check back and correct fetch_source tests