Missing fixtures added and tests fixed