Remove _source parsing and update test