Fix tests enough so that they run.

Units now pass, functionals do not yet (but they do at least run).
Merge branch 'rh/fix-tests' into 0.5.3-maint

* rh/fix-tests:
  Fix tests enough so that they run.