Better formatting and headless testing.