Fix typist inference tests

This was a good start on fixing these tests and should make it so that someone else can help out.