Adaptations to tests