Start fixing specs
Add spring, clean up model specs