Adapting tests