Make concat work properly and add a test for that.