Another round of fixes for non-native tests.