When calling versionsFrom with no track, default to METEOR-CORE

Also a small restructuring I thought I'd need for this test, but ended
up not needing. But it's nice anyways.