Updated functional tests to latest implementation.