Changed over all of the EnvSImple tests to use Make_List (which is much prettier)