Slightly more descriptive name
Unless/else is the devil

Also, rename some variables to something more descriptive.
Whitespace
Add pending for self-tests without names