Adds classes and tests