Fix tests.
Merge pull request #2012 from AnalyticalGraphicsInc/fix-tests

Fix tests.