Properly plan / skip orelse tests

Before we had a plan, some tests were basically ignored.  Now with a plan,
and skips in place, we still somehow miss the last test being executed.
Patches welcome.