changed the test to include AND and OR