Added poller and tests