[WFK-600] - Update to include the functional tests that okiss fixed.