Also, it might aid understanding if you put an ASCII diagram of the test repo's history at the top here.