Test and formatting cleanup