style fixes, increasing unit test coverage