Improvement to string concatenation and new unit tests