handler refactor
Owner tests