Update model and controller test cases along with fixtures