Get test suite working with Typheous 0.5.4
Merge branch 'integration' into debug_token