Controller shouldn't break tests any more