Updated test cases, fixed a bug with where clauses in finds