Adding timeout
Changing the way the callbacks are called
Trying to make the tests more reliable
Merge remote-tracking branch 'upstream/master'
Removing debug
Merge pull request #12 from plus3network/master

Attempting to make test reliable