tests
improved handling for multi data;
refactored conditions handling for update/delete;