added some tests as well as the Where Expression