Fix tests on 1.9+