add to & refactor poly tests