Go through and fix some tests and formatting