Move test classes to packages (Defect #259

Move the classes to the correct package.