Got spec/models to pass all green
Work on tests
Coverage change