tests and filtering

but the else doesn't help, it's just extra lines of code