removed unnecessary test dir
renamed test files