Renaming of tests

renaming the functional tests as well