Fix data model VM chaining issues. Test confirmed now.
Fix fabric tests to match the new "key" format.