THESE CHANGES ARE ALREADY INCORPORATED IN THE TRUNK. Address test stability. This correctly resets the state in between subsequent test runs removing any accidental order dependencies.