Fix functional tests
Merge pull request #80 from kenjis/fix_functional_tests

Fix functional tests