refactor fixtures
use LargerFixture in MailPollerSpec, fix update
move code