tests fixed on 2.6 & 3.3