Minor test cleanup: convert test-directory-fixture into a macro