[BUG #8605] Fixed data store tests