Reset Factory in Dispose to clean up data engine properly
Removed unused tests