Change fetch arguments up a bit, start migrating
added one test