Fix tests
Fix location and comment in qwait.js
some minor details