Fixed fixtures and added new files