Update to Typhoon 1.6.1 and fix unit test failures