Correct fetch_source and expand tests