Fix unittest asserts for 2.6