Made add/remove aware of non FObjects contents. Tests for replacing fragmenting content. Tests that assert on datastore entry size (at least for InMemoryDataStore).
Refactored for a hierarchical test name scheme.