Merge "Add test for Vpn#prepare()" into sc-dev