Use new colour conventions
Fix number of tags in test