Moar mocks

As well as some miscellaneous fixes -- for example, the template was pointing to the wrong controller!