Fix functional tests

Fix #69