Udpate functional tests