Merge "Fix tests for changed transitions"