fix incremental id concat, fix regexp tests