Fix up test a bit even though it's not being run.