fix a broken test in 1.0. I feel SOOOO DIRTY doing this
remove destructive step that I missed (oops !)
remove scenarios that we don't want tested yet