Adding tests for and_together and or_together