added two tests plus scenario modifications