Functional tests updated to new requirements