Fix test and add some support for interaction edit
Remove tests for old code
Fix interaction annotation edit service