test: code-style cleanup

Squash this commit with previous ones in this pull-request.