Merge "Adding server evacuate test"