Expand on the new test battery directives test.

@arjclark - suggested mod to #697.