more tests, return query element for add equals
modify tests