Revert to original fixtures since test store choice does not affect AVS.