minor changes to model building, addition of new model testing files