Insert/update expressions, more functions, more tests