fix tests
Merge branch 'rabbitpy' into focus

* rabbitpy:
  fix tests