JC: refectoring model and controller spec. spec passes.