finished both sets, added basic tests

mostly have questions with diff (and probably some other issues to
address…) - referring to this: http://puu.sh/bDy92.png, should diff
return only the things not in the dashed area or the things in the
dotted area?