Slightly cleaner close
Test suite for diff computation