Not so brute force no more
Updates to the error msgs
Moved to a more appropriate location
special type nodes' names added
Modified test cases and updated tests