Expanding testing classes and reorganizing.