Fixed and tested new class incorporation