Fix size/color grid displaying every color and size

Extend test suite