Added FilterValidatorTest and made minor fixes to FilterValidator