Modify style and add unit test