Fixed commented out tests. Added Z1 Joiner test
reformat
Merge pull request #31 from DSRCompany/joining_tests_fix

Fixed commented out tests. Added Z1 Joiner test
Updated tests
renumber two tests