Add scenario with both time and categorical conditions
Remove unneeded keys from JSON hashes