Formatting fixes and testing data.