Fix unit tests and some setup negotiation.
Don't require a=setup because we compensate correctly
Address review comments
Merge pull request #143 from ekr/MS_fix_setup2

Ms fix setup2