Get functional tests to run. Still failing, however.