Oops, that test file for bug #8316 was needed - was also missing an include and was...