Modify test for more gereric node names

Previous test could fail for node names numeric suffix with more
than one digit. This captures all digits plus checks for names
without a numeric suffix.