Enhanced test method