Convert some more tests
Fix link
Some fixes
Updates for latest cocoapods