Some cleanup, new testing controllers/views/etc.