Bugfix blueprints-test use of convertId

The GraphTest convertId() and convertLabel() methods were
not being used in several places in the test suites.

Also convertId() was erroneously used instead of
convertLabel() in some other places.
Merge pull request #476 from chedbrandh/master

Bugfix blueprints-test use of convertId