Fix tests for non 5.4 version