proper renaming of tests previously in 'Server' directory