tests and filtering

But this isn't an early return. It's two different cases both resulting in a return.