added fixtures.  fixed some imports in models - which might be a duplication of effort