joshua tests refactored further
v1.0 is here