Tidying up controller specs

Instead of having lots of custom code, controller specs now use the
shared examples.

Also ensuring that Images can have DOI assignment