Fix tests and subscribeOptions.