ms_amarisoft: fix various regressions

this patch fixes some regressions in the Amarisoft UE class,
the config template, etc. that have been undetected bc we never
executed tests with it.

Change-Id: I397e675a4018acf3372a3b7e29fd864703b2b919
diff --git a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
index d6ba32d..6f38491 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
@@ -48,7 +48,7 @@
       ue_category: 4,
 
       /* USIM data */
-      sim_algo: "${sub.auth_algo}", /* USIM authentication algorithm: xor, milenage or tuak */
+      sim_algo: "${ue.auth_algo}", /* USIM authentication algorithm: xor, milenage or tuak */
       imsi: "${ue.imsi}",
       K: "${ue.ki}",
 % if ue.opc is not None:
@@ -65,7 +65,7 @@
         event: "power_on",
         start_time: 1,
       }],
-      ue_count: 1,
+      ue_count: ${ue.count},
     }
   ],