Styling changes, new tests.