adjust tests to expect andWhere without Where works