scalatest matchers for Diff, improved tests