Make mock data consistent