Better support for Papertrail in Swift
Fixing bad test