Restructure abaclade-test in preparation for more tests