Added scenarios for story #23