Kingfisher

d7505c68 - Fix a potential test issue on new version platforms