fix merge
check tests
remove events dependency
add tests + notes