Update functional tests to cover new functionality. Create new functional tests.
Update functional tests to cover new functionality. Create new functional tests.