Updates For Functional Test