Core: Implements QUnit.skip

Fixes #637
Fixes #434
While we're here, let's merge these two if statements.