In test, added wait condition for offerer to make sure it doesn't try to connect before answerer is listening
Natty fixes and demo updates