More refactoring; log_node tests