Fix typeof bug and update test outputs.