Formatting updates.
Refactors tests.