Minor test changes to Vagrantfile and remove unused stages