Fix some test-code, and clean clang false-positives.