Assorted improvements to Coding style test case.
/cc @jerome
This will create a new commit in order to revert the existing changes.
