Fix client/subscribed tests.