Fix some colour bugs and update tests