Thanks, looks much better now. I left a couple of small comments in the code review. Other than that, it makes sense to me to update the existing tests to follow this scheme as well. Thanks!

On a related note, since you've obviously studied the filecmp module's operation to a great depth, your input on http://bugs.python.org/issue15430 would be appreciated.