modified tests to use inviter logic
merge of trunk with my changes