Continue the work on the vsite redirect tests

Relate to issue #1176 and PR #1721