corrected 2local: test and improvement classes.