Service provider test tweaks