MM: fix use of user_id

* Change :user_id to be :id to reflect Rails convention
* Update user controller spec. (Inadvertent hitchhiker.)