more tests, all now pass
almost finished model- tests for everything