Add more features to Functional Test