Make model/user spec work again
Make model/user spec work again