Making filtering tests
Adding tests
Still testin