[BUG #8507] Fixed data binding stores and tests