Fix coding standard
Add tests