Add more test data
Concatenation cleanups