refactoring - remove events, add cb to adddata, add more negative tests