Changed Quantifier class. Added tests