Adding filtering by type
Adding tests for filtering by type