subscription fixes and testservlet fixes