AdvertiserService tests tidied up.