Improve Filter tests
Internal filtering working