Adaptations for testing