PDE-428 Updated extended testing to remove hyphens in class name