am a22f980f: Merge "Fix color cube tests."

* commit 'a22f980f993876570eab8297d3c2207c7fe3d65e':
  Fix color cube tests.