Stop in for a cup of coffee

Don’t let the oxygen bottles get away from you. Depending on your local welding supplies dealer sometimes they will trade them out for their brand no questions asked. Sometimes not, just depends on distributor.
And better to own the bottles outright.
Even if you have to trade 'em due to the test date.