Unify controller and integration tests