Made tests more responsive