change raw handler subscription mechanism
fix the tests after raw handler refactoring