added another filterFactorValues combinations test and an additional condition
Merge remote-tracking branch 'origin/master'