Merge changes I64d6c526,I3e8cfcdc

* changes:
  BufferpoolTest: add validity test
  BufferpoolTest: add flush test