Make functional tests operational and passing