Swift 1.1 changes fixed
tests fixed