Made test classes to break things down into more managable parts