Use the get_storage method in checkout
Fix checkout tests