Provide real error messaging for functional test failures

Fixes #178.
Merge branch 'master' into geezer