Updating tests. Corrections in name of classes.