Revert "Revert "fix tests""
Revert "Revert "fix tests""

This reverts commit b7e059d4af0201d4b2d870ec9ca8fc77d1553736.

jckarter/swift,gregomni/swift,stephentyrone/swift,jmgc/swift,tkremenek/swift,apple/swift,aschwaighofer/swift,benlangmuir/swift,ahoppen/swift,allevato/swift,allevato/swift,nathawes/swift,roambotics/swift,roambotics/swift,JGiola/swift,JGiola/swift,karwa/swift,allevato/swift,rudkx/swift,parkera/swift,airspeedswift/swift,atrick/swift,gribozavr/swift,JGiola/swift,tkremenek/swift,rudkx/swift,airspeedswift/swift,hooman/swift,atrick/swift,rudkx/swift,CodaFi/swift,roambotics/swift,gregomni/swift,glessard/swift,harlanhaskins/swift,aschwaighofer/swift,gribozavr/swift,xwu/swift,karwa/swift,harlanhaskins/swift,hooman/swift,parkera/swift,benlangmuir/swift,lorentey/swift,harlanhaskins/swift,CodaFi/swift,jmgc/swift,tkremenek/swift,parkera/swift,harlanhaskins/swift,apple/swift,parkera/swift,tkremenek/swift,glessard/swift,nathawes/swift,hooman/swift,allevato/swift,gregomni/swift,jmgc/swift,airspeedswift/swift,glessard/swift,lorentey/swift,karwa/swift,aschwaighofer/swift,airspeedswift/swift,CodaFi/swift,parkera/swift,apple/swift,atrick/swift,JGiola/swift,nathawes/swift,lorentey/swift,stephentyrone/swift,aschwaighofer/swift,allevato/swift,harlanhaskins/swift,tkremenek/swift,xwu/swift,gribozavr/swift,ahoppen/swift,hooman/swift,ahoppen/swift,xwu/swift,nathawes/swift,lorentey/swift,aschwaighofer/swift,apple/swift,gribozavr/swift,nathawes/swift,airspeedswift/swift,xwu/swift,xwu/swift,glessard/swift,hooman/swift,gregomni/swift,jckarter/swift,rudkx/swift,airspeedswift/swift,aschwaighofer/swift,ahoppen/swift,glessard/swift,atrick/swift,jckarter/swift,airspeedswift/swift,benlangmuir/swift,atrick/swift,CodaFi/swift,ahoppen/swift,stephentyrone/swift,CodaFi/swift,nathawes/swift,stephentyrone/swift,roambotics/swift,tkremenek/swift,ahoppen/swift,parkera/swift,jmgc/swift,gribozavr/swift,CodaFi/swift,CodaFi/swift,karwa/swift,xwu/swift,nathawes/swift,benlangmuir/swift,harlanhaskins/swift,roambotics/swift,karwa/swift,gribozavr/swift,karwa/swift,jmgc/swift,parkera/swift,gregomni/swift,rudkx/swift,parkera/swift,stephentyrone/swift,JGiola/swift,lorentey/swift,apple/swift,gribozavr/swift,gregomni/swift,jckarter/swift,hooman/swift,tkremenek/swift,gribozavr/swift,karwa/swift,harlanhaskins/swift,xwu/swift,allevato/swift,benlangmuir/swift,jckarter/swift,stephentyrone/swift,benlangmuir/swift,hooman/swift,JGiola/swift,lorentey/swift,apple/swift,lorentey/swift,jckarter/swift,rudkx/swift,lorentey/swift,jckarter/swift,jmgc/swift,aschwaighofer/swift,glessard/swift,jmgc/swift,karwa/swift,roambotics/swift,stephentyrone/swift,allevato/swift,atrick/swift