Added clear colour and colour mask macros with tests