Correct coding style
Add testings