Update l2 tests for combo nodes