remove shopping fields. refine tests