Testsuite code-compliance fixes