Remove Jeweller
Add test for subscrition updating