feed: fix tests to be compatible with python 2.6 and pypy