Fix up test cases to match revised HTML
Tweak trafficlight CSS
Order JSON trafficlight output same as HTML