Remove unneeded model tests
Add coverage, add more specs