Updated functional tests