added fixtures and models