Fixed the last tests on scenario