added refactored put test, some fixes to do