More tests, more adaptations.