Controller test

I think this is a good start for controller testing - we may need to set up factory-girl on the mac-minis, but I think that shouldn't be too much of an issue