Update tests and correct fetch_source