updated tests, passed all tox tests on py26, py27, py33, py34, pypy and pypy3 (Linux 64bit)