Adding Twilio tests and some other tweaks