Please refrain from doing ANY changes to tests in this PR. Send them in a separate PR if you must, so they can be checked against the existing code.