Make tests 5.2 compatible