Resolevd #27, filters can't be easily consolidated

I could not figure out a way to consolidate the filters, so I added new tests