Cleaning up some tests.
Merge branch 'master' of https://github.com/Nishant-MC/MIT-Media-AD2014