Fixed tests with missing instance names.
Merge pull request #513 from joneshf/instance-names

Fixed tests with missing instance names.