Updated style.
More fixes to style, fixes to test results json, now returns in the proper order.