[t] Fix some bugs in our testing code and increase from 13/64 to 61/64 passing tests