Updated functional test