added fixture data and updated tests