Fix up the functional tests from the changes in #45