Refactored tests.

Began to integrate Differ, and refactored the legacy TestDiff class.