Tweaks to test to make them pass on 5.3.