Minor style fixes; increase unit test coverage