Change Functional Test to use UnitTest