Better node class coverage