fixes test classes with latest changes.