Update typenames in tests.