fixing failing scenarios