Updated unit tests and added concatenation