Fix warnings

Merged Aaron Bray requested to merge fix/warnings-tests into 3.x

Another round of fixing compiler warnings

Merge request reports