Update draft tests to be less brittle.