Merged drdamour's patch to remove asynchronous code
Fixed script error to expose failing tests