Update given shipping matrix method to accept FactoryGirl build args
Tidy up