Updating functional tests
Updating tests