Added scenarios for story #8