Add swapping for net tests