Update tests for Typhoon 2.x
Merge pull request #14 from Paulche/fix_tests

Update tests for Typhoon 2.x