Stop lisping tests like an igor, make the header smaller