fixed two tests that was left un-refactored with the pubsub optionality change