I think I'd like seeing those replaced by one or two new tests at the controller level