Add functional tests back in