To answers both of your questions, I was trying to minimize code change, but I can also run another `find` to finish cleaning thoses up. I did it this way because `org.scalatest.Matchers` clashes with `org.mockito.Matchers`, which often comes up.