Update Functional tests for SP1.6