Made wait conditional, so we don't have to explain yet another deviation from our fall term report
Also - some more session tests