Fix tests
Fix null filter