Make security-manager tests use their common wrappers