VP-297: Fix to VP-enhancer integration tests.