Add a pair of call waiting tests
Commenting and barriers
Merge pull request #80 from Metaswitch/call_waiting

[Reviewer: Mike] Add a pair of call waiting tests