fix test (broken because of extra log msg)
changed tests for test_and_set
Merge remote-tracking branch 'refs/remotes/origin/test-and-set' into origin-simplify-store
fix test and set behaviour