Fixing coding standards and failing test case