Added subscriber and test