add more verification in scenario tests