JDF-640 Updated functional tests