[Issue #85] [WIP] adds model and controller tests