conform to latest change to spec for dynamic/switch
exception
be specific about case coverage