more swift test fixes