Tests and fixes for "<none>" sourceId