implemented and, or, modulo + tons of new tests