Spree 1.3 upgrade: fix final failing tests