Fix VM tests for changed type