Fix test skipping without cluster

A couple of fixes to restore the ability to run the test suite without an ipcluster present (skipping all the tests that require one with a suitable error message).