Small refactor
Small fix, default concat to true, fix tests