Make tests work again and fix ordering of call to retrieve upgrades to fix Lauran.