don't cover branches
fix two tests so they are python2.6 compatible