Make tests 0.90.2 compatible