Revert "allow for duplicate AND'd queries and skip the tests that assume it's not possible"

This reverts commit a165628f47832849e94047c5d4ef42b080141612.
use the simplification visitor, but dont raise an error for duplicate conditions