Fixed commented out tests. Added Z1 Joiner test