Renaming of functional tests

renaming the functional tests as well