Should be final. Also added vmac-test.