More tests, and formatting