Make some tests work that relied on now-deleted tracks