Colour refactor, update to test reporter