Refractoring of the TestClasses, deleted some duplications.