Change tests to expect colour to be taken from the Point supplied as parameter to some methods
Simplify some method calls by using the colour associated with a Point where possible