Testsuite code-compliance fixes
Merge pull request #573 from ayushchd/codestyle_fixes

Testsuite code-compliance fixes