Added some tests, refactored TwilioMod