update WhereBuilder and test code