[expectations] Use hashtable for categories, adapt interface
[expectations] Adapt simulated scenario 1 to new category interface