Merge "Cleaned up CanvasCompare tests."