Package movement of tests. Disambiguation also for models.