[simeon] refactored workflow scenarios and a few other scenarios to get report green