Remove Typhoon and fix tests to pass.