Make tests pass after changes to checkout broke them all
Fixes following code review for checkout changes