Split handlers
Cover more
more-tests