Fix StubEntityTest
Clean up Cribbbs stuff
Remove mass assignment stuff from Models