More waits in tests
Merge master and comment out failing discussion test