Working on controller spec

I’m still working on the controller spec. Everything is working now,
but not all features are tested yet.