Rework tests in matching-files-only describe-block to be more dynamic