Rename DataHandler to storage.Engine.  Add tests.