Fixed more of the functional tests