Update to match test director reorganization.