bug fix and fix tests for changing state of existing subscriber