Makes changes to tests to support new wing names.