Deleted unnecessary test
Added tests and changed some things in model