Finish cleanup for riddlc 0.24.0

src/main/riddl/test/handler.riddl

@@ -1,16 +1,13 @@
 handler TestGateway is {
   on command TestGateway.CreateScenario {
-    scenario clean is {
-      given "no scenario is currently running"
-      then "create all the entities as defined in the CreateScenario command"
+    if "no scenario is currently running" then {
+      "create all the entities as defined in the CreateScenario command"
     }
   }
 
   on command TestGateway.RunScenario {
-    scenario WhileScenarioRunning is {
-      given "CreateScenario has been called"
-      and  "each of the TenantInfo values provided in CreateTenants"
-      then "create a tenant with matching content, 0 members, and 0 organizations"
+    if "CreateScenario has been called and each of the TenantInfo values provided in CreateTenants" then {
+      "create a tenant with matching content, 0 members, and 0 organizations"
     }
   }
 }

src/main/riddl/test/messages.riddl

@@ -3,11 +3,11 @@ type Percentage is range(0,100)
 
 // value
 record EntityParameters is {
-  tenants: Integer(1),
-  organizations: Integer(1),
-  members: Integer(2),
-  orders: Integer(2),
-  events: Integer(10)
+  tenants: Integer, // 1
+  organizations: Integer,  // (1),
+  members: Integer, // (2),
+  orders: Integer, // (2),
+  events: Integer // (10)
 } described as {
 | These are the parameters for the CreateScenario command. They specify how
 | many of the various entities to create as an upper bound of a random number