Make tests 4.00.1 compliant