Formatting and additional tests.