Finish adding model and controller tests