Port tests with r3812
Port to handlers.h removal (r3816)