attempt to fix tests on 2.6
Merge pull request #1 from michaelrice/26_fix

attempt to fix tests on 2.6