New tests + cleanup + Podfile changed again

Didn't want to send 3 patches which will result in 3 merge commits.

Feel free to reject a commit or two and I'll rebase