Fix remote tests
Merge pull request #624 from kevva/fix-remote-test

Fix remote tests