Style fixes and additions to the unit tests.