remove callbacks from handler and fix ConcurrentModificationException
implement testRemove*()
minor changes (reformat code)
rename tests
simplify tests