Fix for tests
Merge pull request #1 from skarm61/master

Fix for tests