Update tests for Typhoon 2.x

It didn't pass tests before. Now it passes all tests.