Fixed the proper variables for TypeTwo test models, also put in a do