eQa twitter

Added a couple of tests and did a little bit of cleanup. Let me know if this does or doesn't help.