Add tests for batch message moves/deletes
Fix batch moves/deletions