Enhanced test