Expand test isolation to cover all global state, include default map functionality inspired by experimental.catalogqueryplan