added filter-by-animals
added more tests