Fix some test failures
Fix some test failures

apple/swift,roambotics/swift,apple/swift,roambotics/swift,roambotics/swift,roambotics/swift,apple/swift,apple/swift,apple/swift,roambotics/swift,roambotics/swift,apple/swift