More coverage for rbhandler, not in refactor point yet