Spec fixes

Reorganisation in specs. More shared examples is now used.
Some small changes in controllers to correct or enhance functionality.