the additional tests asked for in PR #450, and a small refactor of the director tests to reduce confusing duplication