minor fixes for the unit tests
Merge branch 'master' into gh-pages

* master:
  minor fixes for the unit tests