TestOcropus.scala cleanup.