Simplifing length filter
Fixing unit tests