Issue #2306521 by DanChadwick: Fixed strict warnings when testing.