Remove duplicated files
Refactor the way functional tests are included