VP-297: More test fix-up.