Small fixes in scenarios to fix difference between expected and actual result.