more coding standards fixes, minor rectaoring of testcase