Skip all the additional loop logic.
Add a test for nodes that already have addclass-error.
Remove needless expects assertions.