Fix API changes to BBC Services in tests
Fix avoider tests