Fix warnings
Merge pull request #2238 from AnalyticalGraphicsInc/warning-fix

Fix deprecation warnings in unit tests