updated model and controller tests