Rearrange vagrant and api test scripts