Update test_bundle_various due to removed env.resolver_class