separating skipped from test end and adding interrupt API

I did the exact same thing and got a sane migration... Nevermind - amended and merged.