Cleanup/correct offer/poll tests