Fixed extra services tests.