refactored out simple object storage
fixed timestamp removal
refactoring test suit