Merge "Optimize draw tests."