refactor vpc tests