fix subscriber updates, rethink tests, add more