improve tests so all fixture data is more localised