test and subscribers fix