Fix cleanup if sharding is true
Use spocks builtin IgnoreIf instead of junits Assume

Means that cleanups are only called if the test isn't ignored