More test coverage exclusion tweaks