fix failing scenarios