Make more tests compatible with 5.2