Fix tests for 5.3