Service resolver tests fixes