I handled the merge conflict wrong and am fixing it. #3594
Final version of tet for now with 39 checks #4290