Add andModify
Add first andModify test
Fix test_andModify; add upsert test for andModify
Add sort test to andModify