Fix rabbit spec tests

Backports unit test updates to ensure unit tests pass for 2.x branch.