Fixed all stories scenarios