fix tests for 5.18

Fixed tests for 5.18.