polishing Handler and Delegate tests
solving merge conflict