fixes on MS async tests + rm trailing ws
Merge remote-tracking branch 'upstream/master' into ms-async
remove/update comments
decrease timeout
test refactoring
use step_func instead
Merge pull request #557 from deniak/ms-async

fixes on MS async tests + rm trailing ws