Fix up some tests
Merge pull request #1688 from alex55i/tests-patch

Fix up some tests