Update functional tests for the new design