change polling and add pending tests