Fixed minor problems related to old TestUniformColor.

Also successfully integrated CImg into the project.