Replace rest of existing @trap tests with expect() ones
Replace rest of existing @trap tests with expect() ones

mattrobenolt/invoke,mkusz/invoke,pfmoore/invoke,pfmoore/invoke,frol/invoke,frol/invoke,mattrobenolt/invoke,pyinvoke/invoke,mkusz/invoke,pyinvoke/invoke