Fix some minor formatting niggles
Go back to the full test suite