modified a bit of code
changed timeout condition
Merge pull request #362 from scrollback/embed-test

Fixed the issue of test failure