give up on trying to test py24 and py25 via tox
small cleanups, improve test coverage slightly