Fix tests for 5.3/5.2