Fix tests on 1.8