test: Cleanup of coding style after code review.