fix rotten smokealarm tests (bug 1040803)
don't block on logout to wait for logout api call (bug 996486)