improve store tests and refactored out keyadapter