port updates from other vpi tests
whitespae