mask002: Follow changes in base
T4978: Follow changes in base
BadImport04: Follow changes in base
Remove BadImport04 and BadImport09

They are now redundant
Remove Dep0{3,4}

I'm not sure what they're supposed to test
Update GoodImport03