Change joins to simple concatenations
Update tests to use unittests library
Fix typo