Fix tests
Merge pull request #1898 from davetoxa/fix_ci

Fix tests