Test fixes (Clang warnings mostly)

R=@bnoordhuis