Add zones to taxes and shipping, refactor data fixtures