Made multiple changes to classes and simpletests