Merge "Avoid uninitialized values in draw tests"