Fixed coding standards
Added tests