See, I told you colour was a bad idea! #11

Last commit broke the build, minor fix needed to testsuite.