Removing tests due to contraint errors. Need to mock out entity creation...