Fix up the test suite
Merge branch 'master' into lookup

* master:
  Fix up the test suite