Merge "Add a test for concurrent access"