Refactored StringFilter and Test
Refactored Date filter and added tests