Some test-suite warning fixes