[FEATURE] Functional and Unit Test merging