fixed a test
Merge branch 'master' into gemstone3.1

* master:
  fixed a test