improved unit test code style