Correct bad merge
Fix missing import in Client modified subscriber
Update tests