tests and coverage fixes, esp. python 2.6