Make tests 5.3 compatible