Merge "Fix clean up for test_access_rules tests"