Sync with PC

move and rename file based on Edc version, separate blacklist test