re refactored data fixture