VP-297: Fix tests to use new model relay code. One test fails, properly.