#220 unit test code style fixes