tweaks to get tests working on a cross-compile under Wine