fixed up colour methods and added some tests.