More tests, py2.6 compatibility.