- Fixed folder service test
- Fixed subscription test