insert, update shortcut syntax added (see test.txt for changes)
test refactored