fix tests and stub out fake controller