Fix some tests.
Merge pull request #1061 from EXetoC/fix-tests

Fix some tests.