Fixed bug in distinct when using null options object
Updated tests to still run correctly if other tests failed before removeall is called.