making test independent.
fixing STORE-353
Merge remote-tracking branch 'origin/master'