Fixed more FTs that were using the default service provider

Disabled ATS BatchTests and EndToEndTests due to #965
So it doesn't run