PRS-2 coding style, please
Add some more test