Fix system tests

- Fixed locator & subscribe fn for attach/remove subscriptions
- blocked the add cusom info test with bz