Enhanced testing