Fixed tests.  Now need to implement delete and test with concurrent writes/removes