fix tests that depended on non-manager handler access