[Tunji] X added structure for functional test
[Tunji] X fixed the failing functional test and renamed the test files