update test suite to hopefully be 2.6 compatible