refactor subscriber and dont index test classes