Fixed some tests on 3.3