Fix tests on 1.7+